From ed0ecf0ff0968a1b09448929656c086e5837a28c Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 14 May 2019 00:41:49 +0200 Subject: [PATCH] rendernodeparser: Allow single values instead of 4 This allows writing: colors: red; instead of colors: red red red red; to draw a red border. --- gsk/gskrendernodeparser.c | 123 ++++-- .../gsk/serializedeserialize/testswitch.node | 44 +-- .../serializedeserialize/widgetfactory.node | 370 +++++++++--------- 3 files changed, 302 insertions(+), 235 deletions(-) diff --git a/gsk/gskrendernodeparser.c b/gsk/gskrendernodeparser.c index ec122e594d..caf601d401 100644 --- a/gsk/gskrendernodeparser.c +++ b/gsk/gskrendernodeparser.c @@ -8,8 +8,8 @@ #include "gdk/gdkrgbaprivate.h" #include "gdk/gdktextureprivate.h" #include -#include "gtk/css/gtkcssparserprivate.h" #include "gtk/css/gtkcssdataurlprivate.h" +#include "gtk/css/gtkcssparserprivate.h" typedef struct _Declaration Declaration; @@ -318,18 +318,60 @@ clear_stops (gpointer inout_stops) } } +static gboolean +parse_float4 (GtkCssParser *parser, + gpointer out_floats) +{ + float *floats = (float *) out_floats; + double d[4]; + int i; + + for (i = 0; i < 4 && !gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_EOF); i ++) + { + if (!gtk_css_parser_consume_number (parser, &d[i])) + return FALSE; + } + if (i == 0) + { + gtk_css_parser_error_syntax (parser, "Expected a color"); + return FALSE; + } + for (; i < 4; i++) + { + d[i] = d[(i - 1) >> 1]; + } + + for (i = 0; i < 4; i++) + { + floats[i] = d[i]; + } + + return TRUE; +} + static gboolean parse_colors4 (GtkCssParser *parser, gpointer out_colors) { - GdkRGBA *colors = (GdkRGBA *)out_colors; + GdkRGBA colors[4]; int i; - for (i = 0; i < 4; i ++) + for (i = 0; i < 4 && !gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_EOF); i ++) { if (!gdk_rgba_parser_parse (parser, &colors[i])) return FALSE; } + if (i == 0) + { + gtk_css_parser_error_syntax (parser, "Expected a color"); + return FALSE; + } + for (; i < 4; i++) + { + colors[i] = colors[(i - 1) >> 1]; + } + + memcpy (out_colors, colors, sizeof (GdkRGBA) * 4); return TRUE; } @@ -688,17 +730,17 @@ static GskRenderNode * parse_border_node (GtkCssParser *parser) { GskRoundedRect outline = GSK_ROUNDED_RECT_INIT (0, 0, 0, 0); - graphene_rect_t widths = GRAPHENE_RECT_INIT (0, 0, 0, 0); - GdkRGBA colors[4] = { { 0, 0, 0, 0 }, {0, 0, 0, 0}, {0, 0, 0, 0}, { 0, 0, 0, 0 } }; + float widths[4] = { 1, 1, 1, 1 }; + GdkRGBA colors[4] = { { 0, 0, 0, 1 }, {0, 0, 0, 1 }, {0, 0, 0, 1 }, { 0, 0, 0, 1 } }; const Declaration declarations[] = { { "outline", parse_rounded_rect, NULL, &outline }, - { "widths", parse_rect, NULL, &widths }, + { "widths", parse_float4, NULL, &widths }, { "colors", parse_colors4, NULL, &colors } }; parse_declarations (parser, declarations, G_N_ELEMENTS(declarations)); - return gsk_border_node_new (&outline, (float*)&widths, colors); + return gsk_border_node_new (&outline, widths, colors); } static GskRenderNode * @@ -970,7 +1012,7 @@ static GskRenderNode * parse_blur_node (GtkCssParser *parser) { GskRenderNode *child = NULL; - double blur_radius = 0.0; + double blur_radius = 1.0; const Declaration declarations[] = { { "blur", parse_double, NULL, &blur_radius }, { "child", parse_node, clear_node, &child }, @@ -1654,31 +1696,56 @@ render_node_print (Printer *p, case GSK_BORDER_NODE: { + const GdkRGBA *colors = gsk_border_node_peek_colors (node); + const float *widths = gsk_border_node_peek_widths (node); + guint i, n; start_node (p, "border"); - _indent (p); - g_string_append (p->str, "colors: "); - append_rgba (p->str, &gsk_border_node_peek_colors (node)[0]); - g_string_append_c (p->str, ' '); - append_rgba (p->str, &gsk_border_node_peek_colors (node)[1]); - g_string_append_c (p->str, ' '); - append_rgba (p->str, &gsk_border_node_peek_colors (node)[2]); - g_string_append_c (p->str, ' '); - append_rgba (p->str, &gsk_border_node_peek_colors (node)[3]); - g_string_append (p->str, ";\n"); + if (!gdk_rgba_equal (&colors[3], &colors[1])) + n = 4; + else if (!gdk_rgba_equal (&colors[2], &colors[0])) + n = 3; + else if (!gdk_rgba_equal (&colors[1], &colors[0])) + n = 2; + else + n = 1; + + if (n > 0) + { + _indent (p); + g_string_append (p->str, "colors: "); + for (i = 0; i < n; i++) + { + if (i > 0) + g_string_append_c (p->str, ' '); + append_rgba (p->str, &colors[i]); + } + g_string_append (p->str, ";\n"); + } append_rounded_rect_param (p, "outline", gsk_border_node_peek_outline (node)); - _indent (p); - g_string_append (p->str, "widths: "); - string_append_double (p->str, gsk_border_node_peek_widths (node)[0]); - g_string_append_c (p->str, ' '); - string_append_double (p->str, gsk_border_node_peek_widths (node)[1]); - g_string_append_c (p->str, ' '); - string_append_double (p->str, gsk_border_node_peek_widths (node)[2]); - g_string_append_c (p->str, ' '); - string_append_double (p->str, gsk_border_node_peek_widths (node)[3]); - g_string_append (p->str, ";\n"); + if (widths[3] != widths[1]) + n = 4; + else if (widths[2] != widths[0]) + n = 3; + else if (widths[1] != widths[0]) + n = 2; + else + n = 1; + + if (n > 0) + { + _indent (p); + g_string_append (p->str, "widths: "); + for (i = 0; i < n; i++) + { + if (i > 0) + g_string_append_c (p->str, ' '); + string_append_double (p->str, widths[i]); + } + g_string_append (p->str, ";\n"); + } end_node (p); } diff --git a/testsuite/gsk/serializedeserialize/testswitch.node b/testsuite/gsk/serializedeserialize/testswitch.node index 7c3c7f2728..aca66a507b 100644 --- a/testsuite/gsk/serializedeserialize/testswitch.node +++ b/testsuite/gsk/serializedeserialize/testswitch.node @@ -16,9 +16,9 @@ transform { clip: -1 -1 50 26 / 13; } border { - colors: rgb(205,199,194) rgb(205,199,194) rgb(205,199,194) rgb(205,199,194); + colors: rgb(205,199,194); outline: -1 -1 50 26 / 13; - widths: 1 1 1 1; + widths: 1; } container { container { @@ -57,9 +57,9 @@ transform { } } border { - colors: rgb(191,184,177) rgb(191,184,177) rgb(191,184,177) rgb(191,184,177); + colors: rgb(191,184,177); outline: -1 -1 26 26 / 13; - widths: 1 1 1 1; + widths: 1; } } } @@ -88,9 +88,9 @@ transform { clip: -1 -1 50 26 / 13; } border { - colors: rgb(24,95,180) rgb(24,95,180) rgb(24,95,180) rgb(24,95,180); + colors: rgb(24,95,180); outline: -1 -1 50 26 / 13; - widths: 1 1 1 1; + widths: 1; } transform { child: container { @@ -146,9 +146,9 @@ transform { } } border { - colors: rgb(24,95,180) rgb(24,95,180) rgb(24,95,180) rgb(24,95,180); + colors: rgb(24,95,180); outline: -1 -1 26 26 / 13; - widths: 1 1 1 1; + widths: 1; } } transform: translate(24, 0); @@ -181,9 +181,9 @@ transform { clip: -1 -1 50 26 / 13; } border { - colors: rgb(205,199,194) rgb(205,199,194) rgb(205,199,194) rgb(205,199,194); + colors: rgb(205,199,194); outline: -1 -1 50 26 / 13; - widths: 1 1 1 1; + widths: 1; } container { rounded-clip { @@ -194,9 +194,9 @@ transform { clip: -1 -1 26 26 / 13; } border { - colors: rgb(205,199,194) rgb(205,199,194) rgb(205,199,194) rgb(205,199,194); + colors: rgb(205,199,194); outline: -1 -1 26 26 / 13; - widths: 1 1 1 1; + widths: 1; } } } @@ -227,9 +227,9 @@ transform { clip: -1 -1 50 26 / 13; } border { - colors: rgb(205,199,194) rgb(205,199,194) rgb(205,199,194) rgb(205,199,194); + colors: rgb(205,199,194); outline: -1 -1 50 26 / 13; - widths: 1 1 1 1; + widths: 1; } transform { child: container { @@ -241,9 +241,9 @@ transform { clip: -1 -1 26 26 / 13; } border { - colors: rgb(205,199,194) rgb(205,199,194) rgb(205,199,194) rgb(205,199,194); + colors: rgb(205,199,194); outline: -1 -1 26 26 / 13; - widths: 1 1 1 1; + widths: 1; } } transform: translate(24, 0); @@ -276,9 +276,9 @@ transform { clip: -1 -1 50 26 / 13; } border { - colors: rgb(205,199,194) rgb(205,199,194) rgb(205,199,194) rgb(205,199,194); + colors: rgb(205,199,194); outline: -1 -1 50 26 / 13; - widths: 1 1 1 1; + widths: 1; } container { container { @@ -317,9 +317,9 @@ transform { } } border { - colors: rgb(191,184,177) rgb(191,184,177) rgb(191,184,177) rgb(191,184,177); + colors: rgb(191,184,177); outline: -1 -1 26 26 / 13; - widths: 1 1 1 1; + widths: 1; } } } @@ -371,9 +371,9 @@ transform { } } border { - colors: rgb(191,184,177) rgb(191,184,177) rgb(191,184,177) rgb(191,184,177); + colors: rgb(191,184,177); outline: -1 -1 16 16 / 3; - widths: 1 1 1 1; + widths: 1; } } transform: translate(1, 6); diff --git a/testsuite/gsk/serializedeserialize/widgetfactory.node b/testsuite/gsk/serializedeserialize/widgetfactory.node index 95dd44a686..66dcfdf0cc 100644 --- a/testsuite/gsk/serializedeserialize/widgetfactory.node +++ b/testsuite/gsk/serializedeserialize/widgetfactory.node @@ -55,9 +55,9 @@ transform { } } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -6 0 1464 47 / 7 7 0 0; - widths: 0 0 1 0; + widths: 0 0 1; } transform { child: container { @@ -71,7 +71,7 @@ transform { clip: -17 -5 133 34 / 5 0 0 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -17 -5 133 34 / 5 0 0 5; widths: 1 0 1 1; } @@ -95,7 +95,7 @@ transform { color: rgb(246,245,244); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -17 -5 133 34; widths: 1 0 1 1; } @@ -122,9 +122,9 @@ transform { clip: -17 -5 134 34 / 0 5 5 0; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -17 -5 134 34 / 0 5 5 0; - widths: 1 1 1 1; + widths: 1; } transform { child: text { @@ -152,9 +152,9 @@ transform { clip: -6 -5 36 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -6 -5 36 34 / 5; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -199,7 +199,7 @@ transform { clip: -9 -1 374 34 / 5 0 0 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -9 -1 374 34 / 5 0 0 5; widths: 1 0 1 1; } @@ -246,7 +246,7 @@ transform { border { colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(53,132,228); outline: -10 -5 36 34 / 0 5 5 0; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -272,7 +272,7 @@ transform { clip: -9 -1 374 34 / 5 0 0 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -9 -1 374 34 / 5 0 0 5; widths: 1 0 1 1; } @@ -299,9 +299,9 @@ transform { clip: -10 -5 36 34 / 0 5 5 0; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -10 -5 36 34 / 0 5 5 0; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -327,9 +327,9 @@ transform { clip: -9 -1 410 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -9 -1 410 34 / 5; - widths: 1 1 1 1; + widths: 1; } clip { child: opacity { @@ -368,9 +368,9 @@ transform { clip: -9 -1 410 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -9 -1 410 34 / 5; - widths: 1 1 1 1; + widths: 1; } clip { child: text { @@ -397,7 +397,7 @@ transform { clip: -9 -1 374 35 / 5 0 0 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -9 -1 374 35 / 5 0 0 5; widths: 1 0 1 1; } @@ -424,9 +424,9 @@ transform { clip: -6 -5 36 35 / 0 5 5 0; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -6 -5 36 35 / 0 5 5 0; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -454,7 +454,7 @@ transform { clip: -10 -5 137 34 / 5 0 0 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -10 -5 137 34 / 5 0 0 5; widths: 1 0 1 1; } @@ -489,7 +489,7 @@ transform { color: rgb(246,245,244); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -10 -5 136 34; widths: 1 0 1 1; } @@ -529,9 +529,9 @@ transform { clip: -10 -5 137 34 / 0 5 5 0; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -10 -5 137 34 / 0 5 5 0; - widths: 1 1 1 1; + widths: 1; } container { text { @@ -590,9 +590,9 @@ transform { clip: -1 -1 112 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 112 34 / 5; - widths: 1 1 1 1; + widths: 1; } container { transform { @@ -608,7 +608,7 @@ transform { transform { child: container { border { - colors: rgba(213,208,204,0.3) rgba(213,208,204,0.3) rgba(213,208,204,0.3) rgba(213,208,204,0.3); + colors: rgba(213,208,204,0.3); outline: -6 0 35 32; widths: 0 0 0 1; } @@ -626,7 +626,7 @@ transform { transform { child: container { border { - colors: rgba(213,208,204,0.3) rgba(213,208,204,0.3) rgba(213,208,204,0.3) rgba(213,208,204,0.3); + colors: rgba(213,208,204,0.3); outline: -6 0 35 32 / 0 5 5 0; widths: 0 0 0 1; } @@ -655,9 +655,9 @@ transform { clip: -1 -1 112 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 112 34 / 5; - widths: 1 1 1 1; + widths: 1; } container { transform { @@ -677,7 +677,7 @@ transform { color: rgb(250,249,248); } border { - colors: rgba(213,208,204,0.3) rgba(213,208,204,0.3) rgba(213,208,204,0.3) rgba(213,208,204,0.3); + colors: rgba(213,208,204,0.3); outline: -6 0 35 32; widths: 0 0 0 1; } @@ -702,7 +702,7 @@ transform { clip: -6 0 35 32 / 0 5 5 0; } border { - colors: rgba(213,208,204,0.3) rgba(213,208,204,0.3) rgba(213,208,204,0.3) rgba(213,208,204,0.3); + colors: rgba(213,208,204,0.3); outline: -6 0 35 32 / 0 5 5 0; widths: 0 0 0 1; } @@ -735,9 +735,9 @@ transform { color: rgb(246,245,244); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 3; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -772,9 +772,9 @@ transform { color: rgb(246,245,244); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 3; - widths: 1 1 1 1; + widths: 1; } } transform: translate(5, 2); @@ -801,9 +801,9 @@ transform { color: rgb(246,245,244); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 3; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -838,9 +838,9 @@ transform { color: rgb(250,249,248); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 3; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -875,9 +875,9 @@ transform { color: rgb(250,249,248); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 3; - widths: 1 1 1 1; + widths: 1; } } transform: translate(5, 2); @@ -904,9 +904,9 @@ transform { color: rgb(250,249,248); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 3; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -944,9 +944,9 @@ transform { clip: -1 -1 16 16 / 8; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 8; - widths: 1 1 1 1; + widths: 1; } } transform: translate(5, 2); @@ -976,9 +976,9 @@ transform { clip: -1 -1 16 16 / 8; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 8; - widths: 1 1 1 1; + widths: 1; } } transform: translate(5, 2); @@ -1008,9 +1008,9 @@ transform { clip: -1 -1 16 16 / 8; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 8; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -1048,9 +1048,9 @@ transform { clip: -1 -1 16 16 / 8; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 8; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -1088,9 +1088,9 @@ transform { clip: -1 -1 16 16 / 8; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 8; - widths: 1 1 1 1; + widths: 1; } } transform: translate(5, 2); @@ -1120,9 +1120,9 @@ transform { clip: -1 -1 16 16 / 8; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 16 16 / 8; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -1202,9 +1202,9 @@ transform { clip: -17 -5 122 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -17 -5 122 34 / 5; - widths: 1 1 1 1; + widths: 1; } text { color: rgb(146,149,149); @@ -1226,9 +1226,9 @@ transform { clip: -17 -5 122 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -17 -5 122 34 / 5; - widths: 1 1 1 1; + widths: 1; } text { color: rgb(212,207,202); @@ -1250,9 +1250,9 @@ transform { clip: -17 -5 122 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -17 -5 122 34 / 5; - widths: 1 1 1 1; + widths: 1; } text { color: rgb(146,149,149); @@ -1274,9 +1274,9 @@ transform { clip: -17 -5 122 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -17 -5 122 34 / 5; - widths: 1 1 1 1; + widths: 1; } text { color: rgb(212,207,202); @@ -1299,9 +1299,9 @@ transform { clip: -10 -5 122 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -10 -5 122 34 / 5; - widths: 1 1 1 1; + widths: 1; } container { text { @@ -1339,9 +1339,9 @@ transform { clip: -10 -5 122 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -10 -5 122 34 / 5; - widths: 1 1 1 1; + widths: 1; } container { text { @@ -1379,9 +1379,9 @@ transform { clip: -10 -5 122 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -10 -5 122 34 / 5; - widths: 1 1 1 1; + widths: 1; } container { text { @@ -1421,9 +1421,9 @@ transform { clip: -5 -5 122 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -5 -5 122 34 / 5; - widths: 1 1 1 1; + widths: 1; } container { color { @@ -1432,9 +1432,9 @@ transform { } transform { child: border { - colors: rgba(0,0,0,0.3) rgba(0,0,0,0.3) rgba(0,0,0,0.3) rgba(0,0,0,0.3); + colors: rgba(0,0,0,0.3); outline: -1 -1 112 24; - widths: 1 1 1 1; + widths: 1; } transform: translate(1, 1); } @@ -1455,9 +1455,9 @@ transform { clip: -10 -5 122 34 / 5; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -10 -5 122 34 / 5; - widths: 1 1 1 1; + widths: 1; } container { transform { @@ -1513,9 +1513,9 @@ transform { clip: -1 -1 50 26 / 13; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 50 26 / 13; - widths: 1 1 1 1; + widths: 1; } container { rounded-clip { @@ -1526,9 +1526,9 @@ transform { clip: -1 -1 26 26 / 13; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 26 26 / 13; - widths: 1 1 1 1; + widths: 1; } } } @@ -1544,9 +1544,9 @@ transform { clip: -1 -1 50 26 / 13; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 50 26 / 13; - widths: 1 1 1 1; + widths: 1; } container { rounded-clip { @@ -1557,9 +1557,9 @@ transform { clip: -1 -1 26 26 / 13; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 26 26 / 13; - widths: 1 1 1 1; + widths: 1; } } } @@ -1588,9 +1588,9 @@ transform { clip: -1 -1 502 4 / 2; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 502 4 / 2; - widths: 1 1 1 1; + widths: 1; } transform { child: container { @@ -1602,9 +1602,9 @@ transform { clip: -1 -1 252 4 / 2 1.5 1.5 2; } border { - colors: rgb(53,132,228) rgb(53,132,228) rgb(53,132,228) rgb(53,132,228); + colors: rgb(53,132,228); outline: -1 -1 252 4 / 2 1.5 1.5 2; - widths: 1 1 1 1; + widths: 1; } } transform: translate(0, -1) translate(0, 1); @@ -1623,9 +1623,9 @@ transform { clip: -1 -1 502 4 / 2; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 502 4 / 2; - widths: 1 1 1 1; + widths: 1; } transform { child: container { @@ -1637,9 +1637,9 @@ transform { clip: -1 -1 252 4 / 1.5 2 2 1.5; } border { - colors: rgb(53,132,228) rgb(53,132,228) rgb(53,132,228) rgb(53,132,228); + colors: rgb(53,132,228); outline: -1 -1 252 4 / 1.5 2 2 1.5; - widths: 1 1 1 1; + widths: 1; } } transform: translate(250, -1) translate(0, 1); @@ -1671,9 +1671,9 @@ transform { clip: -1 -1 502 4 / 2; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 502 4 / 2; - widths: 1 1 1 1; + widths: 1; } transform { child: container { @@ -1685,9 +1685,9 @@ transform { clip: -1 -1 102 4 / 1.5; } border { - colors: rgb(53,132,228) rgb(53,132,228) rgb(53,132,228) rgb(53,132,228); + colors: rgb(53,132,228); outline: -1 -1 102 4 / 1.5; - widths: 1 1 1 1; + widths: 1; } } transform: translate(43, -1) translate(0, 1); @@ -1709,15 +1709,15 @@ transform { clip: -3 -3 502 9 / 3; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -3 -3 502 9 / 3; - widths: 1 1 1 1; + widths: 1; } transform { child: border { - colors: rgba(146,149,149,0.15) rgba(146,149,149,0.15) rgba(146,149,149,0.15) rgba(146,149,149,0.15); + colors: rgba(146,149,149,0.15); outline: -1 -1 496 3 / 1; - widths: 1 1 1 1; + widths: 1; } transform: translate(1, 1); } @@ -1731,9 +1731,9 @@ transform { clip: -1 -1 297 3 / 1; } border { - colors: rgb(53,132,228) rgb(53,132,228) rgb(53,132,228) rgb(53,132,228); + colors: rgb(53,132,228); outline: -1 -1 297 3 / 1; - widths: 1 1 1 1; + widths: 1; } } transform: translate(1, 1); @@ -1754,9 +1754,9 @@ transform { clip: -3 -3 502 9 / 3; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -3 -3 502 9 / 3; - widths: 1 1 1 1; + widths: 1; } transform { child: container { @@ -1768,9 +1768,9 @@ transform { clip: -1 -1 97 3 / 1; } border { - colors: rgb(53,132,228) rgb(53,132,228) rgb(53,132,228) rgb(53,132,228); + colors: rgb(53,132,228); outline: -1 -1 97 3 / 1; - widths: 1 1 1 1; + widths: 1; } } transform: translate(2, 1); @@ -1785,34 +1785,34 @@ transform { clip: -1 -1 97 3 / 1; } border { - colors: rgb(53,132,228) rgb(53,132,228) rgb(53,132,228) rgb(53,132,228); + colors: rgb(53,132,228); outline: -1 -1 97 3 / 1; - widths: 1 1 1 1; + widths: 1; } } transform: translate(99, 0) translate(2, 1); } transform { child: border { - colors: rgba(146,149,149,0.15) rgba(146,149,149,0.15) rgba(146,149,149,0.15) rgba(146,149,149,0.15); + colors: rgba(146,149,149,0.15); outline: -1 -1 97 3 / 1; - widths: 1 1 1 1; + widths: 1; } transform: translate(198, 0) translate(2, 1); } transform { child: border { - colors: rgba(146,149,149,0.15) rgba(146,149,149,0.15) rgba(146,149,149,0.15) rgba(146,149,149,0.15); + colors: rgba(146,149,149,0.15); outline: -1 -1 97 3 / 1; - widths: 1 1 1 1; + widths: 1; } transform: translate(297, 0) translate(2, 1); } transform { child: border { - colors: rgba(146,149,149,0.15) rgba(146,149,149,0.15) rgba(146,149,149,0.15) rgba(146,149,149,0.15); + colors: rgba(146,149,149,0.15); outline: -1 -1 97 3 / 1; - widths: 1 1 1 1; + widths: 1; } transform: translate(396, 0) translate(2, 1); } @@ -1835,9 +1835,9 @@ transform { clip: -1 -1 478 4 / 2; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 478 4 / 2; - widths: 1 1 1 1; + widths: 1; } container { rounded-clip { @@ -1848,9 +1848,9 @@ transform { clip: -1 -1 237 4 / 2; } border { - colors: rgb(53,132,228) rgb(53,132,228) rgb(53,132,228) rgb(53,132,228); + colors: rgb(53,132,228); outline: -1 -1 237 4 / 2; - widths: 1 1 1 1; + widths: 1; } } transform { @@ -1863,9 +1863,9 @@ transform { clip: -1 -1 20 20 / 10; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 20 20 / 10; - widths: 1 1 1 1; + widths: 1; } } transform: translate(234, 0) translate(-8, -8); @@ -1886,9 +1886,9 @@ transform { clip: -1 -1 478 4 / 2; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 478 4 / 2; - widths: 1 1 1 1; + widths: 1; } transform { child: container { @@ -1900,9 +1900,9 @@ transform { clip: -1 -1 20 20 / 10; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 20 20 / 10; - widths: 1 1 1 1; + widths: 1; } } transform: translate(234, 0) translate(-8, -8); @@ -1967,9 +1967,9 @@ transform { clip: -1 -1 478 4 / 2; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 478 4 / 2; - widths: 1 1 1 1; + widths: 1; } transform { child: texture { @@ -1998,9 +1998,9 @@ transform { clip: -1 -1 4 362 / 2; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 4 362 / 2; - widths: 1 1 1 1; + widths: 1; } transform { child: container { @@ -2012,9 +2012,9 @@ transform { clip: -1 -1 4 182 / 2 2 1.5 1.5; } border { - colors: rgb(53,132,228) rgb(53,132,228) rgb(53,132,228) rgb(53,132,228); + colors: rgb(53,132,228); outline: -1 -1 4 182 / 2 2 1.5 1.5; - widths: 1 1 1 1; + widths: 1; } } transform: translate(-1, 0) translate(1, 0); @@ -2035,9 +2035,9 @@ transform { clip: -1 -1 4 362 / 2; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 4 362 / 2; - widths: 1 1 1 1; + widths: 1; } transform { child: container { @@ -2049,9 +2049,9 @@ transform { clip: -1 -1 4 182 / 1.5 1.5 2 2; } border { - colors: rgb(53,132,228) rgb(53,132,228) rgb(53,132,228) rgb(53,132,228); + colors: rgb(53,132,228); outline: -1 -1 4 182 / 1.5 1.5 2 2; - widths: 1 1 1 1; + widths: 1; } } transform: translate(-1, 180) translate(1, 0); @@ -2083,9 +2083,9 @@ transform { clip: -1 -1 4 310 / 2; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 4 310 / 2; - widths: 1 1 1 1; + widths: 1; } container { rounded-clip { @@ -2096,9 +2096,9 @@ transform { clip: -1 -1 4 154 / 2; } border { - colors: rgb(53,132,228) rgb(53,132,228) rgb(53,132,228) rgb(53,132,228); + colors: rgb(53,132,228); outline: -1 -1 4 154 / 2; - widths: 1 1 1 1; + widths: 1; } } transform { @@ -2111,9 +2111,9 @@ transform { clip: -1 -1 20 20 / 10; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 20 20 / 10; - widths: 1 1 1 1; + widths: 1; } } transform: translate(0, 151) translate(-8, -8); @@ -2143,9 +2143,9 @@ transform { clip: -1 -1 4 310 / 2; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 4 310 / 2; - widths: 1 1 1 1; + widths: 1; } transform { child: container { @@ -2157,9 +2157,9 @@ transform { clip: -1 -1 20 20 / 10; } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 20 20 / 10; - widths: 1 1 1 1; + widths: 1; } } transform: translate(0, 151) translate(-8, -8); @@ -2193,7 +2193,7 @@ transform { border { colors: rgb(213,208,204) rgb(255,255,255) rgb(255,255,255) rgb(213,208,204); outline: -1 -1 114 135; - widths: 1 1 1 1; + widths: 1; } text { color: rgb(146,149,149); @@ -2210,7 +2210,7 @@ transform { border { colors: rgb(255,255,255) rgb(213,208,204) rgb(213,208,204) rgb(255,255,255); outline: -1 -1 114 135; - widths: 1 1 1 1; + widths: 1; } text { color: rgb(146,149,149); @@ -2228,17 +2228,17 @@ transform { border { colors: rgb(213,208,204) rgb(255,255,255) rgb(255,255,255) rgb(213,208,204); outline: -2 -2 114 135; - widths: 1 1 1 1; + widths: 1; } border { colors: rgb(255,255,255) rgb(213,208,204) rgb(213,208,204) rgb(255,255,255); outline: -1 -1 112 133; - widths: 1 1 1 1; + widths: 1; } border { - colors: rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0); + colors: rgba(0,0,0,0); outline: -2 -2 114 135; - widths: 2 2 2 2; + widths: 2; } } text { @@ -2257,17 +2257,17 @@ transform { border { colors: rgb(255,255,255) rgb(213,208,204) rgb(213,208,204) rgb(255,255,255); outline: -2 -2 114 135; - widths: 1 1 1 1; + widths: 1; } border { colors: rgb(213,208,204) rgb(255,255,255) rgb(255,255,255) rgb(213,208,204); outline: -1 -1 112 133; - widths: 1 1 1 1; + widths: 1; } border { - colors: rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0); + colors: rgba(0,0,0,0); outline: -2 -2 114 135; - widths: 2 2 2 2; + widths: 2; } } text { @@ -2295,9 +2295,9 @@ transform { transform { child: container { border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 212 289; - widths: 1 1 1 1; + widths: 1; } color { bounds: 204 281 6 6; @@ -2334,9 +2334,9 @@ transform { } } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: 13 28 16 16 / 3; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -2400,9 +2400,9 @@ transform { } } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: 13 51 16 16 / 3; - widths: 1 1 1 1; + widths: 1; } } color { @@ -2458,9 +2458,9 @@ transform { } } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: 13 74 16 16 / 3; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -2536,9 +2536,9 @@ transform { } } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: 13 97 16 16 / 8; - widths: 1 1 1 1; + widths: 1; } color-matrix { child: texture { @@ -2604,7 +2604,7 @@ transform { color: rgb(252,252,252); } border { - colors: rgb(246,245,244) rgb(246,245,244) rgb(246,245,244) rgb(246,245,244); + colors: rgb(246,245,244); outline: -6 0 42 25; widths: 0 1 1 0; } @@ -2625,7 +2625,7 @@ transform { color: rgb(252,252,252); } border { - colors: rgb(246,245,244) rgb(246,245,244) rgb(246,245,244) rgb(246,245,244); + colors: rgb(246,245,244); outline: -6 0 40 25; widths: 0 1 1 0; } @@ -2646,7 +2646,7 @@ transform { color: rgb(252,252,252); } border { - colors: rgb(246,245,244) rgb(246,245,244) rgb(246,245,244) rgb(246,245,244); + colors: rgb(246,245,244); outline: -6 0 71 25; widths: 0 1 1 0; } @@ -2667,9 +2667,9 @@ transform { color: rgb(252,252,252); } border { - colors: rgb(246,245,244) rgb(246,245,244) rgb(246,245,244) rgb(246,245,244); + colors: rgb(246,245,244); outline: -6 0 60 25; - widths: 0 0 1 0; + widths: 0 0 1; } text { color: rgb(146,149,149); @@ -2692,9 +2692,9 @@ transform { transform { child: container { border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 212 263; - widths: 1 1 1 1; + widths: 1; } container { color { @@ -2730,9 +2730,9 @@ transform { transform { child: container { border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 354 142; - widths: 1 1 1 1; + widths: 1; } container { transform { @@ -2742,9 +2742,9 @@ transform { color: rgb(234,232,230); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 352 37; - widths: 0 0 1 0; + widths: 0 0 1; } transform { child: container { @@ -2808,9 +2808,9 @@ transform { transform { child: container { border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 354 142; - widths: 1 1 1 1; + widths: 1; } container { color { @@ -2824,7 +2824,7 @@ transform { color: rgb(234,232,230); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -2 -1 67 140; widths: 0 0 0 1; } @@ -2883,9 +2883,9 @@ transform { transform { child: container { border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 353 142; - widths: 1 1 1 1; + widths: 1; } container { color { @@ -2899,9 +2899,9 @@ transform { color: rgb(234,232,230); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -2 351 37; - widths: 1 0 0 0; + widths: 1 0 0; } transform { child: container { @@ -2958,9 +2958,9 @@ transform { transform { child: container { border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 353 142; - widths: 1 1 1 1; + widths: 1; } container { transform { @@ -2970,7 +2970,7 @@ transform { color: rgb(234,232,230); } border { - colors: rgb(213,208,204) rgb(213,208,204) rgb(213,208,204) rgb(213,208,204); + colors: rgb(213,208,204); outline: -1 -1 67 140; widths: 0 1 0 0; } -- 2.30.2